Autogenerated HTML docs for v1.7.4.1-343-ga91df
diff --git a/git-pull.html b/git-pull.html index 5c37cf8..8472ebb 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -649,7 +649,7 @@ </dt> <dd> <p> - Operate quietly. + Operate quietly. Implies --no-progress. </p> </dd> <dt class="hdlist1"> @@ -663,6 +663,20 @@ Be verbose. </p> </dd> +<dt class="hdlist1"> +--progress +</dt> +<dt class="hdlist1"> +--no-progress +</dt> +<dd> +<p> + Turn progress on/off explicitly. If neither is specified, + progress is shown if standard error is connected to a terminal. + Note that not all merge strategies may support progress + reporting. +</p> +</dd> </dl></div> <div class="dlist"><dl> <dt class="hdlist1">